From: Maxim Ermilov <zaspire@rambler.ru>
Date: Sun, 30 Jan 2011 23:04:56 +0000 (+0300)
Subject: dnd: If needed, destroy _dragActor in _cancelDrag
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8563
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d38f41a459e3ce8bc11aeeca1efae443df49f73b;p=gnome-shell.git

dnd: If needed, destroy _dragActor in _cancelDrag

In the case where the original actor is destroyed, we don't
show a snap back animation, so we need to destroy drag actor
as we would do in _onAnimationComplete.

https://bugzilla.gnome.org/show_bug.cgi?id=640781
---

diff --git a/js/ui/dnd.js b/js/ui/dnd.js
index 46d32fdd3..46440d6ff 100644
--- a/js/ui/dnd.js
+++ b/js/ui/dnd.js
@@ -507,6 +507,9 @@ _Draggable.prototype = {
             if (!this._buttonDown)
                 this._dragComplete();
             this.emit('drag-end', eventTime, false);
+            if (!this._dragOrigParent)
+                this._dragActor.destroy();
+
             return;
         }